Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CNAME blocking states and show more details in CNAME blocking #1144

Merged
merged 6 commits into from
Feb 10, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jan 29, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

  1. Implement support for new CNAME-related blocking modes signaling that something was blocked "under the surface" of a query
    Screenshot at 2020-01-29 23-22-12

  2. Show domain that was the actual reason for blocking in case we blocked as a result of a deep CNAME inspection
    Screenshot at 2020-01-29 22-57-40

How does this PR accomplish the above?:

Display new information passed in from pi-hole/FTL#685

What documentation changes (if any) are needed to support this PR?:

None

…EX_CNAME, QUERY_BLACKLIST_CNAME] and show domain that was the reason for blocking during a CNAME inspection

Signed-off-by: DL6ER <dl6er@dl6er.de>
…e with specifying the domainid as GET parameter.

Signed-off-by: DL6ER <dl6er@dl6er.de>
…uch as blocked CNAMEs)

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER marked this pull request as ready for review February 3, 2020 21:34
@DL6ER DL6ER force-pushed the new/CNAME_inspection_details branch 4 times, most recently from cb3ca53 to d638b45 Compare February 4, 2020 07:25
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER force-pushed the new/CNAME_inspection_details branch 4 times, most recently from 5140006 to a45d3d4 Compare February 4, 2020 21:01
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER force-pushed the new/CNAME_inspection_details branch from a45d3d4 to 249dfc7 Compare February 4, 2020 21:20
@DL6ER DL6ER merged commit 843e46d into release/v5.0 Feb 10, 2020
@DL6ER DL6ER deleted the new/CNAME_inspection_details branch February 10, 2020 08:16
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/request-show-regex-responsible-for-blocking/27656/30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants